Autogenerated HTML docs for v2.2.0-rc0
diff --git a/git-am.html b/git-am.html index eeeea98..ec23b31 100644 --- a/git-am.html +++ b/git-am.html
@@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> <head> <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" /> -<meta name="generator" content="AsciiDoc 8.6.6" /> +<meta name="generator" content="AsciiDoc 8.6.9" /> <title>git-am(1)</title> <style type="text/css"> /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ @@ -87,10 +87,16 @@ ul > li { color: #aaa; } ul > li > * { color: black; } -pre { +.monospaced, code, pre { + font-family: "Courier New", Courier, monospace; + font-size: inherit; + color: navy; padding: 0; margin: 0; } +pre { + white-space: pre-wrap; +} #author { color: #527bbd; @@ -219,7 +225,7 @@ } div.imageblock div.content { padding-left: 0; } -span.image img { border-style: none; } +span.image img { border-style: none; vertical-align: text-bottom; } a.image:visited { color: white; } dl { @@ -349,7 +355,7 @@ margin-bottom: 0.1em; } -div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { +div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 { margin-top: 0; margin-bottom: 0; } @@ -407,18 +413,14 @@ span.overline { text-decoration: overline; } span.line-through { text-decoration: line-through; } +div.unbreakable { page-break-inside: avoid; } + /* * xhtml11 specific * * */ -tt { - font-family: monospace; - font-size: inherit; - color: navy; -} - div.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -452,12 +454,6 @@ * * */ -.monospaced { - font-family: monospace; - font-size: inherit; - color: navy; -} - table.tableblock { margin-top: 1.0em; margin-bottom: 1.5em; @@ -537,6 +533,8 @@ @media print { body.manpage div#toc { display: none; } } + + </style> <script type="text/javascript"> /*<+'])'); + var re = new RegExp('[hH]([1-'+(toclevels+1)+'])'); // Function that scans the DOM tree for header elements (the DOM2 // nodeIterator API would be a better technique but not supported by all // browsers). @@ -610,7 +608,7 @@ var i; for (i = 0; i < toc.childNodes.length; i++) { var entry = toc.childNodes[i]; - if (entry.nodeName == 'div' + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") && entry.getAttribute("class").match(/^toclevel/)) tocEntriesToRemove.push(entry); @@ -656,7 +654,7 @@ var entriesToRemove = []; for (i = 0; i < noteholder.childNodes.length; i++) { var entry = noteholder.childNodes[i]; - if (entry.nodeName == 'div' && entry.getAttribute("class") == "footnote") + if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote") entriesToRemove.push(entry); } for (i = 0; i < entriesToRemove.length; i++) { @@ -792,7 +790,7 @@ </dt> <dd> <p> - Add a <tt>Signed-off-by:</tt> line to the commit message, using + Add a <code>Signed-off-by:</code> line to the commit message, using the committer identity of yourself. </p> </dd> @@ -804,7 +802,7 @@ </dt> <dd> <p> - Pass <tt>-k</tt> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). + Pass <code>-k</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). </p> </dd> <dt class="hdlist1"> @@ -812,7 +810,7 @@ </dt> <dd> <p> - Pass <tt>-b</tt> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). + Pass <code>-b</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). </p> </dd> <dt class="hdlist1"> @@ -820,10 +818,10 @@ </dt> <dd> <p> - With <tt>--keep-cr</tt>, call <em>git mailsplit</em> (see <a href="git-mailsplit.html">git-mailsplit(1)</a>) + With <code>--keep-cr</code>, call <em>git mailsplit</em> (see <a href="git-mailsplit.html">git-mailsplit(1)</a>) with the same option, to prevent it from stripping CR at the end of - lines. <tt>am.keepcr</tt> configuration variable can be used to specify the - default behaviour. <tt>--no-keep-cr</tt> is useful to override <tt>am.keepcr</tt>. + lines. <code>am.keepcr</code> configuration variable can be used to specify the + default behaviour. <code>--no-keep-cr</code> is useful to override <code>am.keepcr</code>. </p> </dd> <dt class="hdlist1"> @@ -865,21 +863,21 @@ </dt> <dd> <p> - Pass <tt>-u</tt> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). + Pass <code>-u</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). The proposed commit log message taken from the e-mail is re-coded into UTF-8 encoding (configuration variable - <tt>i18n.commitencoding</tt> can be used to specify project’s + <code>i18n.commitencoding</code> can be used to specify project’s preferred encoding if it is not UTF-8). </p> <div class="paragraph"><p>This was optional in prior versions of git, but now it is the -default. You can use <tt>--no-utf8</tt> to override this.</p></div> +default. You can use <code>--no-utf8</code> to override this.</p></div> </dd> <dt class="hdlist1"> --no-utf8 </dt> <dd> <p> - Pass <tt>-n</tt> flag to <em>git mailinfo</em> (see + Pass <code>-n</code> flag to <em>git mailinfo</em> (see <a href="git-mailinfo.html">git-mailinfo(1)</a>). </p> </dd> @@ -1026,8 +1024,8 @@ <p> When a patch failure occurs, <msg> will be printed to the screen before exiting. This overrides the - standard message informing you to use <tt>--continue</tt> - or <tt>--skip</tt> to handle the failure. This is solely + standard message informing you to use <code>--continue</code> + or <code>--skip</code> to handle the failure. This is solely for internal use between <em>git rebase</em> and <em>git am</em>. </p> </dd> @@ -1078,7 +1076,7 @@ </ul></div> <div class="paragraph"><p>is taken as the beginning of a patch, and the commit log message is terminated before the first occurrence of such a line.</p></div> -<div class="paragraph"><p>When initially invoking <tt>git am</tt>, you give it the names of the mailboxes +<div class="paragraph"><p>When initially invoking <code>git am</code>, you give it the names of the mailboxes to process. Upon seeing the first patch that does not apply, it aborts in the middle. You can recover from this in one of two ways:</p></div> <div class="olist arabic"><ol class="arabic"> @@ -1098,7 +1096,7 @@ </ol></div> <div class="paragraph"><p>The command refuses to process new mailboxes until the current operation is finished, so if you decide to start over from scratch, -run <tt>git am --abort</tt> before running the command with mailbox +run <code>git am --abort</code> before running the command with mailbox names.</p></div> <div class="paragraph"><p>Before any patches are applied, ORIG_HEAD is set to the tip of the current branch. This is useful if you have problems with multiple @@ -1110,8 +1108,8 @@ <div class="sect1"> <h2 id="_hooks">HOOKS</h2> <div class="sectionbody"> -<div class="paragraph"><p>This command can run <tt>applypatch-msg</tt>, <tt>pre-applypatch</tt>, -and <tt>post-applypatch</tt> hooks. See <a href="githooks.html">githooks(5)</a> for more +<div class="paragraph"><p>This command can run <code>applypatch-msg</code>, <code>pre-applypatch</code>, +and <code>post-applypatch</code> hooks. See <a href="githooks.html">githooks(5)</a> for more information.</p></div> </div> </div> 